changes from martin and other changes.