some changes with sub+plugins