Last edits before demo