adding changes based on Joe's feedback