Refactored 60 and sped it up.