Going to change the grammar construction