Improve efficiency, implement different method for tatum-finding