More addressed (5/27)

More addressed