merge with Andreas stuff