Optimizations and updated starting values