Alpha 0.4.430 prep work part 2

Alpha 0.4.430 prep work part 2