on behalf of jackson
Merged Dixie and Jackson's changes