Views optimization ended. Ready to merge for final version.