Still some address problems but still better