final commit for demo v2