[@Siaya Dragalorn] good changes! Accepted