Still trying to remove bugs