Some cool changes :)