cleaned up api, document-menu not updating properly