removing dependency on accordion structure