Work towards improving controls