Added settings - draft 1