performance improvements & design changes