Updated to my likings