Address trond's comments