Another one

One addition and small changes