More addressed (7/27)

More addressed