rejiggered to make easier for users