major update for syntax changes