adding sean's requested changes