Simplified
 - Simplified and Tweaked code