updated with changes from plmday