Smalll changes to setup