lattest changes from Eric