Reworked some bits here