Sightly refactor pt 6 - lib re-implented