Migrated latest updates from Parker to Penelope