Seem to be working well now