Separate step into two stages to handle message ordering: prep and step
fix part of notes, still old and misleading