Reworked some stuff