added some changeS