Maybe tweak some command stuff?