FIXED more of bruno's grammar