updated join functions -- gave up.