Simplified and streamlined