Make it better please