First changes, started diverging from Oliver's work.