some changes with the syntax