just merge to pull in the entrance and official use page