Modified setup to be run by other users