Simplified master logic