More addressed (3/27)

More addressed