Tried fixing some stuff, might have broken it