Address needs (5/31)

Address needs