performance improvements (?)