Changed some initialization stuff