missing master code merged back