Reworking some stuff
The latest update