changed by alice's dev branch