Updates by Taldeen