with profile and ad editing
Merge branch 'adding-state_machine'