move comment to the new method?