Change files as requested in #26