Extended the blackedout code