routineGenerator and layout
routineGenerator
fixed merge conflicts