Added half-worked controller