master merge to make presentation