refactoring power supply AND fixing the size of map arrays
refactoring power supply AND fixing the size of map arrays \nmerged Edition