you don't need to combine the functions for this pull request