Filled in missing deferred logic