It's pretty much working now