Angel restocking added and TODO for convert_raw