This pr was to make things not crash, not rewrite our steps...