Increased some efficiency