minimal changes to support the BB10