Changes to unit fixed