Made vince's suggestions