Polish up layer switch