jackie-merge changes