Plugin remake pt. 2