This is feature 2
Merged changes into program