few changes to setup