Bumping expiry buffer to 30 seconds and added comment