Updated setup to new version