Seems to finally be working