2.5 Update - reworked the system