merged changes from the SalesManager branch