cleaned up for japid42 0.9