After full draft testing
Plugged memory leaks