Last commit to pre-demo launch