Merged Brandon's changes with adding spot light.