Added missing stuff to previous commit