Cleaned up demo 2