Added Manual selection option