memory leaks were fixed
intermediate commit