Simplified the return