made controller more sense