Fixed units
merging changes