Updated to only use new settings variables