Updated to cleaned version