Removed rotation temporarily and removed 'Smart IDs'