UV instead of EV

I changed up the code so that UV functions are called instead of EV functions. Let me know what you think.