edit and make it better