changed how shit is setup in the command stream