updating all calls to use one helper method