Updated for Love 1.9