Fixed it (pt 2)