revamped everything, lol