committing final changes to this dying branch