-change: trying to reduce call stack size