Change files as requested in #31