first commit
not sure about changes