[IMP] crm:improvements in code