Submitting Tigran's changes.