More addressed (11/27)

More addressed