Submitting Hayk's changes.