Changes incorporated until Sept-3rd for power modelling project