reworking commands and requests