Update [Gaayyy]'s codes