changes from fix branch