did some stuff
merged