added valid until clause