fixes in steps