Final dev version commit for final demo