multiMode Changes
Merge pull request #66 from adrianagm/multiMode_Changes

Multi mode changes