changes with stuff
merged