need to change the custom queries to display the appropriate information