entities joined; new queries; some team stuff added