Reworked everything
Reworked everything