Changed some constants