beautfied and updated lol