bj2015 changes
bj2015 fixed