Changed two weeks to 30s