Improve speed of plan