Added in u_current and v_current variable pulls for Elliott.