Changed some bits here and there