V.2 of basin finder