some incomplete updates to make coupling work