Finally final

And features not so big memory leak!