Trying to improve categories.