Reworked some stuff | Gonna try with Volt again