Slight refac
1.8.9