modified to remove post commands