code change from jo