Changed most of the things