additions to f650a12647ccb19899b552f2d9768864f2f8a01a