Made changes to add settings