REWORKED 1.31