initial commit of modified setup