Slight refactor, plus required settings