Changes from gerry