@jahangirbalti: done all 3 thins