adding more yoko features