added some important things