Added settings criteria