Lightzone: Modified pull request with the changes you advertised