Added some disposing