minor syntax changes 2