added cutis's changes