Final commit after approval
minor updates for demo purposes