Made controller section better.