Addressed comments from Narek's review