try to improve perfs, again