More progress, but stuck with call overriding limitations