modify how to deal with rest