Make changes for better start