change model ierarchy
ERROR fix needed