Updated to 2Way Mode