Changed some types around