Combine into controller