Design Changes due to Melanie Feedback