Andreas' initial changes on SiStrip