Code modifications [MRB]