updates per G's suggestion