Work on heaters; p-stop