Added stuff from chalmers ETC