Added arbitrary instance back, and fixed main