added changes for main