WyC: more changes ahead of #174