changed some bits here and there