changes
feature 1 implemented