New class, some modifications in toString