performance improvements
update