Changes from dave