some stuff changed lol