Step1 works after some fixes have been made