optimizations, tentative
update