Small changes for to be awesome ;)