More addressed (18/27)

More addressed