Added missing grid statements and clear