merge yari's change in source