Minor optimization for Home loading