Originally created demo app and modified framework