Changes in mainclass