Simplified handover array from 2d to 1d with sample rate, added new modules