cleaned up for demo