trying to implement josh's feedback