Added some stuff to Master