Main Class updates