changes made for 1-step version