Work in progress
Minor changes.