Adapted to many commands