More addressed (10/27)

More addressed