Updates by ELSWEEDY PSP