Replaced protocol method with a better one