Grammar is better now