few enhancements in Sale part