Change Return Value to match requirement