changed and added some constants