Updates by etminan azargol