Address needs (22/31)

Address needs