1st part | 4th feature (some improvements)