Move out one more function