Changes and Improvements assignment 14