Fixed and simplyfied grammer