1.2 fully redid