Replaced depracated returning with tap