updated and beautified lol