Make first steps more granular