modified all indicate and swap freq unit