Current version of transport code (to be deleted later)