a few changes according to inspector