Some changes for booting...!