Main class updated