Revised master code