(BY: mark) New feature S finished