Adding strict returns