Works with 1.29.3
Small refactoring + modifications