some work done on the setup controller