changes and stuff
merged stuff