fleshed out the setup a bit