Wienke's changes
removed some stuff to make it work