Making the edits for gui compatibility