Adding changes - better changelog can be found under refactoru-midterm