Change files as requested in #24