these changes should have been included with earlier commit. adding them now