updated join & page checks