Better handling for initial load