cleaned up demo a bit