incorporated Justin's feedback