Updates by Wajeeh ayesh