Tweaked code for make_simple