More work on uTP Implemtation