Kinda changed some things hope it's ok