Making further improvements