@saimaali: Done both follow