BS3 conversion done for now