update from essarraj