Should now be working a lot better