Lea's changes
Fix merge conflicts