Adress review comments MR-14