updated for pre-demo