setting it up proper (master)