beginning to implement Andy's comments