Pushing some late final code