Cueie's changes