final syntax changes