updated to including settings