Copied original file from master to solarcollector branch