Seems to be working a lot better now..