Way better overlapping command logic