could we fold this logic into one method of the application or adapter?