last bit of merge bits from fix branch
updating syntax in view