added return statement after 'no data'