Reverted to pre-demo code