working on linking issues in 2_1