Still trying to fix ordering bug...