some new added, menu helper and other