refactored getting links from beepi