PP:enabled memory leaks fix, it works with updated assignemnt code