include this logic in the new method?