updated by lsavic