Modified condition statements for adding suppressors. Functionality is unchanged.