some changes to avoid confusion