Updated

Proper Default Settings Set