Fixing based on new files from Amy