Added Collin's viewport improvement