Add between/and to simplify build mutual transition