performance improvements :)