rearranged querys