add shift; fix junction