changes to make it work on CB