cleaned up carrier selection
major rewrite