Add more controle