merge from almasaeed2010