revert & improve previous commit