now works in 2 steps or in 1 step