Modified and fixed settings issue.