Updated to include grid