Worked on light calc constructor