tidy up, add stub for basis mode