add limit to prevent DatastoreTimeoutExceptions
Adding bumped version