new version for removed spinner