working again except for removes