Just a little upgrade to the setup