updated setup and changes