More responsive changes and improvements