added some join stuffs