Number class slightly modified