changes to include manual drain and tier0 status