Better controller approach