revert to Galit's version