Pre-processing
UPDATED
