Simplified and Working