minor patch method optimizations added