cleaned up
merged stuff