Changed some conventions