In this paper we propose a method of improving channel estimates for non-coherent terminals with channels that can be considered constant over multiple time slots. The terminals have multiple antennas and are free to choose whichever antenna they want to use in each time slot. An unknown phase shift is introduced in each time slot as we cannot guarantee that the terminals are phase coherent across time slots. The proposed methods of improving channel estimates are a combination of clustering and heuristic methods. With our proposed methods we can have an improvement of 1.5 dB at 1 bit/s/Hz.