Added settings check code