Tiau - added new stuff [JP]