switched the entire project over to account criteria