Further condensed code to enable fast editing