us changes/class implementation