fixes in step2