Missed one method to refactor -_-