Did more work on update logic and added timing