added some commits
merged changes