migrated changes to the executable from the live demo branch