Feature/dev ph3