Going to chang from queue solution to additional grid solution