some stuff changed