Refactor
Added stress test