done 3 and fixed 2