VI-123 re build