Initial changes for blur branch.