add stages to Julian
Merge branch 'fix_julian' into dev