totally blanked out teddy's changes...whoops