fixing to remove some constants