V1.1 : Now working with lightsources