Handling Nermin's review comments