bug fixes, limit 5 minutes