Added remaining time option