Some changes for initial temperature loading