Little altering of main code