Some awesome changes :)