set up and few changes