Merged with corrections.