Improve feature according to @fideloper feedback