Simplified and updates