Adding yo functionality