Re-beautified. view 3