changed name and fixed errors :D