first commit
merged changes