corrected version
merging changes