this should help with some more memory leak manamgent