cleaning up
trying to update
merged in flatten