applying latest changes from private