Adding working controls