Adding back controls