More addressed (6/27)

More addressed