[IMP-dev] First code review