changes suggested from jtlan