pre July work
merged updatees