Sync with Pricetx's branch