1.0.8 attempt 2 (I broke errything)