reflect changes pr 140