Merged changes from old file.