implementation of yomi's changes