Refactor + Add batch function for a very specific task