new things
merged joe