WIP
(re)moved some impersonate functions