change some things to apper better