Switching light to static implementation