Address needs (24/31)

Address needs