Simplified and Added Settings