added to Emi's CS~