Added Gustavs stuffz