Changed few things in main