Awesome improvements!~!!!! needs to be pretty