ACTUALLLY obeying DRY