Updates after finishing foundation demo