Updated project again

Finally got rid of cr_value