more changes for metacommands