Step3 and fixes