Seems to work now, before removing validation at every step