Added running option