Added team3's changes