Improve the TYPE