Add steps and ordering