changed return method