set back to default
Changed from default so it is cleaner
Added some new variables