Did something to prevent memory leaks and fixed sticks