refactor
fixes issues with refactor
merge remote branch