other uncommitted stuff from gil's project