Updated with grid drawn