Try to make it better looking