fixing and merging changes