changed timer back to 30s