changes to work with billit, debug version