More addressed (12/27)

More addressed