first commit
merged code