lesser changes according panda2, some stuff still fails