Updated to include new grid proposal