Simplified the code a bit and switched to old light model