Abstract: As part of our CPS project, we have focused on the problem of model repair for cyber-physical systems. This work involves identifying constraints caused due to physical components during revision. We consider four types of constraints cyber-cyber, cyber-physical, physical-cyber and  physical-physical. Based on the complexity limitations caused by these constraints we are developing efficient heuristics to mitigate the cost of model repair. We have also focused on extending revision to code level.