Monitor mode modified/optimized