While packing its bags for a September departure, the National Aquarium is also in negotiations with the General Services Administration that could someday lead to a Constitution Avenue homecoming, the Washington Examiner reports.

The GSA has been working for about six years to keep the aquarium inside the U.S. Department of Commerce’s headquarters, its home since the 1930s.