Demo

Updating master to comply with the lab description