Merged the codes.

Light is now expanding. Needs polish.