Added return grammar
Fixed grammar to have definitions first