clean version, works finne