Controller improvements