Reverted last commit re checking for advanced monitors, temp fix.