More addressed (20/27)

More addressed