Gn gwtp 59

Good point, I think I will work on it in a new task / branch. WDYT ?