Add auto-sorting and paypal support