Various changes after catching up with customer