change around based on BR feedback, eliminate extra query