Modified: small stuff with a return value