Added time guards to reduce the load