don't set default steps
fix steps logica and make more methods private