Drop jk and change scheme