Fixing bugs
merging