Update description
Refactor/rewrite as previous version was not even working