update to cleaned version