major improvement for season 2