Added logic for P079