[master mine]controller changes