added semi-pseudo implementation of 2.6