work on fixing tokenisation