More addressed (4/27)

More addressed