gerneal update. removed work and some new mappings