Adding Artem's suggestion to NON