Changed stuff to simplify debugging