Update by AL YAMAMA