changes by travis, uploaded by me