Simplified, much less complicated solution