Updated Main Class.