WIP adjust to new pericmd