Refactor of the Lure