Added some master code