Make this easier to edit...