merge yari's changes