updates from feedback - 1 hour