Upgraded mapping for buffers (can switch while insrt mode now), first try on replace engine