Adding disposal (work in progress)