Slightly modify 1800