Cleaned up previous fix- better performance and less weird hanging lights.