Fixed one way issue in MPS; updated controllers