Master -- My 2nd attempt for supernova integration