Current state is not as bad as it was written :-)