Changes recommended by @axilleas