added a little to the setup