some needed changes