copy over changes from import.5apps.com