Raza Revamp

Hope this works. :)