lots of changes... someday this will slow down..?