Various small changes in design, Best of Solano implementation