lets try to fix some stuff