Fixed delay
fixed mergin errors