Finished making it work with my own batches