small changes in setup