attempt to do more optimization