Split controller action into two