some stuff
merged changes