Added Barrier Option
Added switches