changes to work with cb4
making it work :)