cleaned up demo