update from nazmul's machine