added working controller