Slight refactor on 7