Add stuff from time at Cray