Add Yorcia message so it works? Untested.