Updating for custom return