finished last changes on interface& switch