Dev stage1 changes