updated changes. closes #511