Increased some performance