fixed conversion and added cbr