Steal elly's new view code, fixing lighting