Almost fixed the processing