Cean-up. Working UPDATE.