Update to callculating offset values, still not quite right so will need
more work.