Changed __init__ to make calling shorter