upgrade on WIP for my friend on Y!;s req <3