Changed some internal stuff