cut out some of the recent design changes... not enough very efficient
.