-- Working version of 1.4.1 tokumx