Jb mr1

updates by hashcode