Changed stuff to make Stewart happy