Update to V2

Re-written to be more efficient