Added subMenus + modify sample