Added more optouts.