it should all be working now