export improved implementation