Moved logic to Yak.