added old gen stuff