some changes that should be awesome