Much more clean version of the original