Updated update to reduce overhead and fixed bug from testing