incorporated connor's suggestion