merged again from greg