Changes by sjobe