2_1 fixed memory consumption issues