changes from 9-12-14 / 10-12-14