changing step/need to work out generic address