Major Change

Simplified instantiation.