Changed __init__ in main class, so its updated with branch A