Added controls up until 9.2.6