Update to version refactored by Emilw

Refactored version is avaliable