a couple of experimental change are made, still in dev and tuning