ok... second times a charm

cleaned up
+ re-added