Cleaner threat solving. Though not correct yet