fixing destruction issues WIP