Working on more fine grained enhancements.