Make a little less complicated