done all but extras