new pass for testing and improved DAO queries