stuff
merged some stuff