+Improving and refactoring code
+Updating methods in model class