Trying to make it better