Speed up improvements